Update .install files for build-system output changes

diff --git a/debian/libpyside6-dev.install b/debian/libpyside6-dev.install
index 1f8a0c8735569c4332ba0d0536c7907702dbff2e..bc2edd9929cc78f74a6cf035e02e3544223cd765 100644 (file)
--- a/debian/libpyside6-dev.install
+++ b/debian/libpyside6-dev.install
@@ -1,5 +1,6 @@
-usr/include/PySide6 usr/include
-usr/lib/cmake/PySide6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
-usr/lib/libpyside6*.so usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/pkgconfig/pyside6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-usr/share/PySide6 usr/share
+build/qfp*/install/include/PySide6 usr/include
+build/qfp*/install/lib/cmake/PySide6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
+build/qfp-*/install/lib/libpyside6*.so usr/lib/${DEB_HOST_MULTIARCH}
+build/qfp-*/install/lib/pkgconfig/pyside6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+build/qfp-*/install/share/PySide6 usr/share
+usr/lib/python*/dist-packages/PySide6/include/ usr/

diff --git a/debian/libpyside6-py3-6.6.install b/debian/libpyside6-py3-6.6.install
index be15cc41318f83a62fdb9166d3091731c62c6786..f99741f6355702d8603b83a63e073a2bde713781 100644 (file)
--- a/debian/libpyside6-py3-6.6.install
+++ b/debian/libpyside6-py3-6.6.install
@@ -1,5 +1,12 @@
-usr/lib/libpyside6*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/python*/dist-packages/PySide6/__init__.py usr/lib/python3/dist-packages/PySide6
-usr/lib/python*/dist-packages/PySide6/_config.py usr/lib/python3/dist-packages/PySide6
-usr/lib/python*/dist-packages/PySide6/_git_pyside_version.py usr/lib/python3/dist-packages/PySide6
-usr/lib/python*/dist-packages/PySide6/support/ usr/lib/python3/dist-packages/PySide6
+build/qfp-*/install/lib/libpyside6*.so.*            usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/python*/dist-packages/PySide6-*-info/
+usr/lib/python*/dist-packages/PySide6/__init__.py
+usr/lib/python*/dist-packages/PySide6/__feature__.pyi
+usr/lib/python*/dist-packages/PySide6/py.typed
+usr/lib/python*/dist-packages/PySide6/_config.py
+usr/lib/python*/dist-packages/PySide6/_git_pyside_version.py
+usr/lib/python*/dist-packages/PySide6/support/
+usr/lib/python*/dist-packages/PySide6/typesystems
+usr/lib/python*/dist-packages/PySide6/glue
+usr/lib/python*/dist-packages/PySide6/Qt/modules/*.json
+usr/lib/python*/dist-packages/PySide6/Qt/lib/*/qt6/metatypes/*.json

diff --git a/debian/libshiboken6-dev.install b/debian/libshiboken6-dev.install
index 3ab2063d815a5168b9764362fd4e34de6110fb2e..c1fda3bcf2f009c10b549057ddf70b8ffacc18bb 100644 (file)
--- a/debian/libshiboken6-dev.install
+++ b/debian/libshiboken6-dev.install
@@ -1,4 +1,4 @@
-usr/include/shiboken6 usr/include
-usr/lib/cmake/Shiboken6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
-usr/lib/libshiboken6*.so usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/pkgconfig/shiboken6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+build/qfp-*/install/include/shiboken6 usr/include
+build/qfp-*/install/lib/cmake/Shiboken6* usr/lib/${DEB_HOST_MULTIARCH}/cmake
+build/qfp-*/install/lib/libshiboken6*.so usr/lib/${DEB_HOST_MULTIARCH}
+build/qfp-*/install/lib/pkgconfig/shiboken6.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig

diff --git a/debian/libshiboken6-py3-6.6.install b/debian/libshiboken6-py3-6.6.install
index 48f50ad10c611f6e4f70952bdd354e4594bddcda..b8f5c130a7ccd117d41dcf2cd39934be3960360a 100644 (file)
--- a/debian/libshiboken6-py3-6.6.install
+++ b/debian/libshiboken6-py3-6.6.install
@@ -1,2 +1,3 @@
-usr/lib/libshiboken6*.so.* usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/python3*/dist-packages/shiboken6/* usr/lib/python3/dist-packages/shiboken2
+build/qfp-*/install/lib/libshiboken6*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+build/qfp-*/install/lib/python3*/dist-packages/shiboken6* usr/lib/python3/dist-packages/
+usr/lib/python*/dist-packages/shiboken6*

diff --git a/debian/not-installed b/debian/not-installed
index 4139daf1dd988fb910c023ff010bb19f1f885133..3b75af265a2d1201d350691eace9100227b700c5 100644 (file)
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,30 +1,8 @@
-# binaries, unneeded?
-usr/bin/assistant
-usr/bin/deploy.py
-usr/bin/deploy/*
-usr/bin/designer
-usr/bin/linguist
-usr/bin/lrelease
-usr/bin/metaobjectdump.py
-usr/bin/project.py
-usr/bin/project/*
-usr/bin/pyside_tool.py
-usr/bin/qml.py
-usr/bin/qmlcachegen
-usr/bin/qmlformat
-usr/bin/qmlimportscanner
-usr/bin/qmllint
-usr/bin/qmlls
-usr/bin/qmltyperegistrar
-usr/bin/qtpy2cpp.py
-usr/bin/qtpy2cpp_lib/*
-usr/bin/rcc
-usr/bin/shiboken_tool.py
-usr/bin/uic
-usr/bin/android_deploy.py
-usr/bin/deploy_lib/*
 
-# not needed?
-usr/lib/python3/dist-packages/shiboken6_generator/__init__.py
-usr/lib/python3/dist-packages/shiboken6_generator/_config.py
-usr/lib/python3/dist-packages/shiboken6_generator/_git_shiboken_generator_version.py
+# there are two copies of all outputs in the package:
+# one in ./build/.../install/ that is in normal FHS format,
+# and another in dist-packages that we don't want
+usr/lib/python*/dist-packages/PySide6/scripts/deploy_lib
+usr/lib/python*/dist-packages/PySide6/include/
+usr/lib/python*/dist-packages/PySide6/libpyside6.*.so.*
+usr/lib/python*/dist-packages/PySide6/libpyside6qml.*.so.*

diff --git a/debian/pyside6-tools.install b/debian/pyside6-tools.install
index e36411e57a8c83f01d575ba8decd016ad7b42e71..a41611d28f9368bc1d0407f49d716354fdb87d18 100644 (file)
--- a/debian/pyside6-tools.install
+++ b/debian/pyside6-tools.install
@@ -1,2 +1,12 @@
-#usr/bin/pyside6-* usr/bin
-usr/bin/lupdate
+usr/bin/pyside6-* usr/bin
+usr/bin/shiboken6-genpyi
+usr/lib/python*/dist-packages/PySide6/assistant
+usr/lib/python*/dist-packages/PySide6/designer
+usr/lib/python*/dist-packages/PySide6/linguist
+usr/lib/python*/dist-packages/PySide6/lrelease
+usr/lib/python*/dist-packages/PySide6/lupdate
+usr/lib/python*/dist-packages/PySide6/qmlformat
+usr/lib/python*/dist-packages/PySide6/qmllint
+usr/lib/python*/dist-packages/PySide6/qmlls
+usr/lib/python*/dist-packages/PySide6/Qt/libexec
+usr/lib/python*/dist-packages/PySide6/scripts/

diff --git a/debian/python-pyside6-doc.docs b/debian/python-pyside6-doc.docs
index 40ea2b76fc7b93044737a7bf288f4f1afdddd2cd..de3e488cf46924580f1b0c7f1ed9f7af87fcb4ac 100644 (file)
--- a/debian/python-pyside6-doc.docs
+++ b/debian/python-pyside6-doc.docs
@@ -1,3 +1,4 @@
 README.md
 README.pyside6.md
 README.shiboken6.md
+sources/pyside6/doc/

diff --git a/debian/python3-pyside6.qtdesigner.install b/debian/python3-pyside6.qtdesigner.install
index 1143281ed3b0f8b7fe7d9787086b84d8ecdcce5e..b454cd7f17b2eb56d6969556e3112b5c21999a87 100644 (file)
--- a/debian/python3-pyside6.qtdesigner.install
+++ b/debian/python3-pyside6.qtdesigner.install
@@ -1,3 +1,3 @@
-usr/lib/*/qt6/plugins/designer/libPySidePlugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/designer/
+build/qfp-*/install/lib/*/qt6/plugins/designer/libPySidePlugin.so usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/designer/
 usr/lib/python3*/dist-packages/PySide6/QtDesigner.*.so usr/lib/python3/dist-packages/PySide6
 usr/lib/python3*/dist-packages/PySide6/QtDesigner.pyi usr/lib/python3/dist-packages/PySide6

diff --git a/debian/shiboken6-doc.docs b/debian/shiboken6-doc.docs
index 11daf76c315f73d8ce575513e93a6a102f6827c5..8a6b526d4959520eddacb8bcaa00d6026383d83d 100644 (file)
--- a/debian/shiboken6-doc.docs
+++ b/debian/shiboken6-doc.docs
@@ -1 +1 @@
-#/shiboken6/doc/html
+build/qfp-*/build/shiboken6/doc/html/